reviewed by: Matthias Clasen

2008-05-25  Jaap A. Haitsma  <jaap@haitsma.org>

	reviewed by: Matthias Clasen

	* gtk/Makefile.am:
	* gtk/gtk.h:
	* gtk/gtk.symbols:
	* gtk/gtkshow.c: (gtk_show_uri):
	* gtk/gtkshow.h:
	Add gtk_show_uri to make showing uris really easy. Fixes bug #514396

svn path=/trunk/; revision=20143

diff --git a/ChangeLog b/ChangeLog
index 8a993cc232af67faacfcbecdab7c10cf7f887a28..69387299eb987cc1a76e4679f4be8dff53d2277e 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,14 @@
+2008-05-25  Jaap A. Haitsma  <jaap@haitsma.org>
+
+       reviewed by: Matthias Clasen
+
+       * gtk/Makefile.am:
+       * gtk/gtk.h:
+       * gtk/gtk.symbols:
+       * gtk/gtkshow.c: (gtk_show_uri):
+       * gtk/gtkshow.h:
+       Add gtk_show_uri to make showing uris really easy. Fixes bug #514396
+
 2008-05-25  Jan Arne Petersen  <jpetersen@jpetersen.org>
 
        * gtk/gtkliststore.c: (list_store_text): Use type of the correct

diff --git a/gtk/Makefile.am b/gtk/Makefile.am
index 8b63c5c1e87b5221f4695c070d1191f0c4c27519..ec01ca06cc843b096cda9263687ccf82a21e068a 100644 (file)
--- a/gtk/Makefile.am
+++ b/gtk/Makefile.am
@@ -280,6 +280,7 @@ gtk_public_h_sources =          \
        gtkseparator.h          \
        gtkseparatormenuitem.h  \
        gtkseparatortoolitem.h  \
+       gtkshow.h               \
        gtksettings.h           \
        gtksizegroup.h          \
        gtksocket.h             \
@@ -543,6 +544,7 @@ gtk_base_c_sources =            \
        gtkseparatortoolitem.c  \
        gtksettings.c           \
        gtksizegroup.c          \
+       gtkshow.c               \
        gtksocket.c             \
        gtkspinbutton.c         \
        gtkstatusbar.c          \

diff --git a/gtk/gtk.h b/gtk/gtk.h
index cf5c6e675973c9cb4f6e218852a6ae0fed693fbd..7b6d5071faa21e9472457e57b8e1a410509dbcb8 100644 (file)
--- a/gtk/gtk.h
+++ b/gtk/gtk.h
@@ -158,6 +158,7 @@
 #include <gtk/gtkseparatormenuitem.h>
 #include <gtk/gtkseparatortoolitem.h>
 #include <gtk/gtksettings.h>
+#include <gtk/gtkshow.h>
 #include <gtk/gtksizegroup.h>
 #include <gtk/gtksocket.h>
 #include <gtk/gtkspinbutton.h>

diff --git a/gtk/gtk.symbols b/gtk/gtk.symbols
index 7ef4fdb593976bd54605de94f9bbc28b118a13ab..3b3c65cbb6b1a3c3634f00e469978b6d54cda5a4 100644 (file)
--- a/gtk/gtk.symbols
+++ b/gtk/gtk.symbols
@@ -3498,6 +3498,11 @@ gtk_size_group_set_mode
 #endif
 #endif
 
+#if IN_HEADER(__GTK_SHOW_H__)
+#if IN_FILE(__GTK_SHOW_C__)
+gtk_show_uri
+#endif
+#endif
 
 #if IN_HEADER(__GTK_SOCKET_H__)
 #if IN_FILE(__GTK_SOCKET_C__)

diff --git a/gtk/gtkshow.c b/gtk/gtkshow.c
new file mode 100644 (file)
index 0000000..8c91618
--- /dev/null
+++ b/gtk/gtkshow.c
@@ -0,0 +1,75 @@
+/* 
+ * GTK - The GIMP Toolkit
+ * Copyright (C) 2008  Jaap Haitsma <jaap@haitsma.org>
+ *
+ * All rights reserved.
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the
+ * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+ * Boston, MA 02111-1307, USA.
+ */
+
+#include <config.h>
+
+#include <glib.h>
+#include <gio/gio.h>
+#include "gdk/gdkscreen.h"
+#include "gdk/gdkapplaunchcontext.h"
+
+#include "gtkshow.h"
+
+
+/**
+ * gtk_show_uri:
+ * @screen: screen to show the uri on or NULL for the default screen
+ * @uri: the uri to show
+ * @timestamp: a timestamp to prevent focus stealing. 
+ * @error: a #GError that is returned in case of errors
+ *
+ * This is a convenience function for launching the default application to show 
+ * the uri. The uri can amongst others (depending on support in gio/gvfs) take 
+ * the following forms:
+ * "file:///home/gnome/pict.jpg",
+ * "http://www.gnome.org",
+ * "mailto:me@gnome.org",
+ * "ghelp:eog".
+ * Ideally the timestamp is taken from the event triggering gtk_show_uri. 
+ * If timestamp is not known you can take %GDK_CURRENT_TIME
+ *
+ * Returns: %TRUE on success, %FALSE on error.
+ *
+ * Since: 2.14
+ */
+gboolean
+gtk_show_uri (GdkScreen *screen, 
+              const char* uri, 
+              guint32 timestamp, 
+              GError **error)
+{
+  GdkAppLaunchContext *context;
+  gboolean ret;
+
+  g_return_val_if_fail (uri != NULL, FALSE);
+
+  context = gdk_app_launch_context_new ();
+
+  gdk_app_launch_context_set_screen (context, screen);
+  
+  gdk_app_launch_context_set_timestamp (context, timestamp);
+
+  ret = g_app_info_launch_default_for_uri (uri, (GAppLaunchContext*)context, error);
+  g_object_unref (context);
+
+  return ret;
+}

diff --git a/gtk/gtkshow.h b/gtk/gtkshow.h
new file mode 100644 (file)
index 0000000..68699c1
--- /dev/null
+++ b/gtk/gtkshow.h
@@ -0,0 +1,40 @@
+/* 
+ * GTK - The GIMP Toolkit
+ * Copyright (C) 2008  Jaap Haitsma <jaap@haitsma.org>
+ *
+ * All rights reserved.
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the
+ * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+ * Boston, MA 02111-1307, USA.
+ */
+#ifndef __GTK_SHOW_H__
+#define __GTK_SHOW_H__
+
+#include <glib.h>
+#include "gdk/gdkscreen.h"
+
+G_BEGIN_DECLS
+
+gboolean gtk_show_uri  (GdkScreen *screen, 
+                        const char* uri, 
+                        guint32 timestamp, 
+                        GError **error);
+
+G_END_DECLS
+
+#endif /* __GTK_SHOW_H__ */
+
+
+